Missed two files from NULL-pointer-check changeset.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
index 93c39fd858bd6622e36eac227438983f5272d57e..30486a426d6ab0bf33a1492b982f205c5fc252e4 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
@@ -1173,8 +1173,7 @@ again:
  destroy_ring:
        shutdown_device(info);
  out:
-       if (backend)
-               kfree(backend);
+       kfree(backend);
        return err;
 }
 

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
index 55ba4b41ad51d68a4eaf5c18d1344f9ab07867ef..a646a3d3018dad2e2c64d64d8e9a567b8df2e045 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
@@ -570,10 +570,8 @@ void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt, ...)
        }
 
 fail:
-       if (printf_buffer)
-               kfree(printf_buffer);
-       if (path_buffer)
-               kfree(path_buffer);
+       kfree(printf_buffer);
+       kfree(path_buffer);
 }
 EXPORT_SYMBOL(xenbus_dev_error);